Merge "Disallow empty paths in LockManager"